From 55b5c847f7efcc8d3de3088999aa47fd7386c0f2 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sat, 1 Apr 2023 01:53:52 +0200 Subject: [PATCH] wayland: Use zxdg_output_manager_v1_get_version() --- gdk/wayland/gdkdisplay-wayland.c | 5 ++--- gdk/wayland/gdkdisplay-wayland.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index b87fad34ae..36474c39da 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -495,11 +495,10 @@ gdk_registry_handle_global (void *data, } else if (strcmp(interface, "zxdg_output_manager_v1") == 0) { - display_wayland->xdg_output_manager_version = MIN (version, 3); display_wayland->xdg_output_manager = wl_registry_bind (display_wayland->wl_registry, id, &zxdg_output_manager_v1_interface, - display_wayland->xdg_output_manager_version); + MIN (version, 3)); gdk_wayland_display_init_xdg_output (display_wayland); _gdk_wayland_display_async_roundtrip (display_wayland); } @@ -2309,7 +2308,7 @@ should_expect_xdg_output_done (GdkWaylandMonitor *monitor) GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display); return (monitor_has_xdg_output (monitor) && - display_wayland->xdg_output_manager_version < NO_XDG_OUTPUT_DONE_SINCE_VERSION); + zxdg_output_manager_v1_get_version (display_wayland->xdg_output_manager) < NO_XDG_OUTPUT_DONE_SINCE_VERSION); } static void diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h index 649194dad4..80a3ef503c 100644 --- a/gdk/wayland/gdkdisplay-wayland.h +++ b/gdk/wayland/gdkdisplay-wayland.h @@ -136,7 +136,6 @@ struct _GdkWaylandDisplay int seat_version; int data_device_manager_version; int gtk_shell_version; - int xdg_output_manager_version; int pointer_gestures_version; uint32_t server_decoration_mode; -- 2.30.2